Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream1107 #128

Merged
merged 400 commits into from
Jul 15, 2024
Merged

Conversation

Schrodinger71
Copy link
Collaborator

@Schrodinger71 Schrodinger71 commented Jul 12, 2024

Описание PR

Подтянул актуалочку мастера корвухов

🆑 Шрёдька

  • tweak: Upstream 12.07.24, подтянуты коммиты с корвакса.

DrSmugleaf and others added 30 commits June 28, 2024 22:42
Add Destructible component to BaseMech
So all mechs are destructable now
It greatly annoys me in the rare instance I do play.
* Added fovarite button

* Some fixes in xaml

* added some events for favorite recipes

* set methods for presenter

* fixes for  presenter

* added translates

* reset seach when you select any category

* added some margins

* some fixes from compared

* fixed PR notes about arrays

* deleted controls & margins

* did simpleer with arrays

* review

---------

Co-authored-by: metalgearsloth <[email protected]>
* add textures

* add SealingCabinet system

* add StoreUnlocker/ObjectiveUnlock system

* add plutonium core and nuke core container

* make nuke deconstructable

* add steal core objective

* add core extraction toolbox to new category

* typo ops wrench fuel

* use queries and resolve, have it resolve instead of using Comp

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* Atmos department rework

* move paperwork back to library

* Would you believe I forgot a valve?

* camer and fore extinguisher wallmounts in new room.
* Ensure trait groups get validated

The only validation being done was on the UI. I also made the "Default" group match the PascalCase naming schema so might be a slight breaking change but the original PR only got merged a few days ago.

* overwatch
Revert "plutonium core steal objective (#26786)"

This reverts commit f6ce072.
Gas lost via wrench/breaking capped
* fix explosion resistance showing 0 values

* markup
Miners now can produce a fraction of their SpawnAmount corresponding
to the "remaining space" available in their environment according to
their MaxExternalPressure and MaxExternalAmount.
* Oh the possibilities

* Merge fixes

* Forgot to remote LavaSystem oops

* Changed EntityEffectArgs to EntityEffectBaseArgs and EntityEffectReagentArgs

* Throw exception for unimplemented effectargs

* Remove Json and overrideable datafields

* Fix test issues

* Actually fix the compiling issue

* Fix comments and remove EntityEffectArgs (no longer used, replaced with EntityEffectBaseArgs)
* Fix some job's drobes point light

* Fix some job's drobes point light
-1 is a silly API because now you have to handle it everywhere manually instead of using nullability.
…(#29461)

* Fix ItemMapper whitelist mispredict when inserting or removing items

Makes the ItemMapper MapLayerData available on client so that the client
can predict whether an inserted/removed item changes the visibility of
a sprite layer.

* review

---------

Co-authored-by: metalgearsloth <[email protected]>
PJBot and others added 16 commits July 10, 2024 10:33
Fixed whitelist locale
* Character menu asks if you want to save your character on exit

* Fix

* Another fix, little mistake by me

* Update Content.Client/Lobby/UI/CharacterSetupGuiSavePanel.xaml.cs

---------

Co-authored-by: metalgearsloth <[email protected]>
* Revert "SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763)"

This reverts commit 3ceb92a.

* Revert configs

* Oops
…ream-sync

# Conflicts:
#	.github/labeler.yml
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Shared/Chat/TypingIndicator/TypingChangedEvent.cs
…am-sync

# Conflicts:
#	Resources/Locale/ru-RU/administration/ui/tabs/babyjail-tab.ftl
@Schrodinger71 Schrodinger71 self-assigned this Jul 12, 2024
@github-actions github-actions bot added Changes: UI Изменение интерфейса Changes: Sprites Изменение спрайтов Changes: Map Изменение карт Changes: Localization Изменение локализации labels Jul 12, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Schrodinger71 Schrodinger71 merged commit a37ed48 into AdventureTimeSS14:master Jul 15, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Map Изменение карт Changes: Sprites Изменение спрайтов Changes: UI Изменение интерфейса
Projects
None yet
Development

Successfully merging this pull request may close these issues.